Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JENKINS-60465] - add stapler converter for KeyStoreSource #129

Closed
wants to merge 2 commits into from
Closed

[JENKINS-60465] - add stapler converter for KeyStoreSource #129

wants to merge 2 commits into from

Conversation

jetersen
Copy link
Member

@jetersen jetersen commented Dec 12, 2019 •
edited
Loading

fixes JENKINS-60465

Like to add a test to show export works

credentials:
  system:
    domainCredentials:
    - credentials:
      - usernamePassword:
          description: "testing user pass"
          id: "testing.user.pass"
          password: "{AQAAABAAAAAQBNSp+lQPLqE9vM9tzbbf7vFHAM5zDVtPYizetEpo0Fo=}"
          scope: GLOBAL
          username: "test"
      - certificate:
          description: "testing certificate"
          id: "test.certificate"
          keyStoreSource: "FAILED TO EXPORT com.cloudbees.plugins.credentials.impl.CertificateCredentialsImpl#keyStoreSource:\
            \ org.apache.commons.lang.IllegalClassException: Expected: com.cloudbees.plugins.credentials.SecretBytes,\
            \ actual: com.cloudbees.plugins.credentials.SecretBytes\r  at com.cloudbees.plugins.credentials.SecretBytes$StaplerConverterImpl.convert(SecretBytes.java:367)\r\
            \  at com.cloudbees.plugins.credentials.SecretBytes$StaplerConverterImpl.convert(SecretBytes.java:359)\r\
            \  at org.apache.commons.beanutils.ConvertUtilsBean.convert(ConvertUtilsBean.java:544)\r\
            \  at io.jenkins.plugins.casc.impl.configurators.DataBoundConfigurator.describe(DataBoundConfigurator.java:239)\r\
            \  at io.jenkins.plugins.casc.impl.configurators.HeteroDescribableConfigurator.lambda$convertToNode$de0cd4f8$1(HeteroDescribableConfigurator.java:233)\r\
            \  at io.vavr.CheckedFunction0.lambda$unchecked$52349c75$1(CheckedFunction0.java:201)\r\
            \  at io.jenkins.plugins.casc.impl.configurators.HeteroDescribableConfigurator.convertToNode(HeteroDescribableConfigurator.java:233)\r\
            \  at io.jenkins.plugins.casc.impl.configurators.HeteroDescribableConfigurator.lambda$describe$5(HeteroDescribableConfigurator.java:103)\r\
            \  at io.vavr.control.Option.map(Option.java:373)\r  at io.jenkins.plugins.casc.impl.configurators.HeteroDescribableConfigurator.describe(HeteroDescribableConfigurator.java:103)\r\
            \  at io.jenkins.plugins.casc.impl.configurators.HeteroDescribableConfigurator.describe(HeteroDescribableConfigurator.java:51)\r\
            \  at io.jenkins.plugins.casc.Attribute.describe(Attribute.java:197)\r\
            \  at io.jenkins.plugins.casc.impl.configurators.DataBoundConfigurator.describe(DataBoundConfigurator.java:255)\r\
            \  at io.jenkins.plugins.casc.impl.configurators.HeteroDescribableConfigurator.lambda$convertToNode$de0cd4f8$1(HeteroDescribableConfigurator.java:233)\r\
            \  at io.vavr.CheckedFunction0.lambda$unchecked$52349c75$1(CheckedFunction0.java:201)\r\
            \  at io.jenkins.plugins.casc.impl.configurators.HeteroDescribableConfigurator.convertToNode(HeteroDescribableConfigurator.java:233)\r\
            \  at io.jenkins.plugins.casc.impl.configurators.HeteroDescribableConfigurator.lambda$describe$5(HeteroDescribableConfigurator.java:103)\r\
            \  at io.vavr.control.Option.map(Option.java:373)\r  at io.jenkins.plugins.casc.impl.configurators.HeteroDescribableConfigurator.describe(HeteroDescribableConfigurator.java:103)\r\
            \  at io.jenkins.plugins.casc.impl.configurators.HeteroDescribableConfigurator.describe(HeteroDescribableConfigurator.java:51)\r\
            \  at io.jenkins.plugins.casc.Attribute.describe(Attribute.java:193)\r\
            \  at io.jenkins.plugins.casc.impl.configurators.DataBoundConfigurator.describe(DataBoundConfigurator.java:255)\r\
            \  at io.jenkins.plugins.casc.Attribute.describe(Attribute.java:193)\r\
            \  at com.cloudbees.plugins.credentials.casc.SystemCredentialsProviderConfigurator.describe(SystemCredentialsProviderConfigurator.java:76)\r\
            \  at com.cloudbees.plugins.credentials.casc.SystemCredentialsProviderConfigurator.describe(SystemCredentialsProviderConfigurator.java:48)\r\
            \  at io.jenkins.plugins.casc.Attribute.describe(Attribute.java:197)\r\
            \  at com.cloudbees.plugins.credentials.casc.CredentialsRootConfigurator.describe(CredentialsRootConfigurator.java:90)\r\
            \  at com.cloudbees.plugins.credentials.casc.CredentialsRootConfigurator.describe(CredentialsRootConfigurator.java:52)"
          password: "{AQAAABAAAAAQj/YRHipPxGeU136Y+vu6Rjh9OUWRKnCwFg6Gf+A2SUQ=}"
          scope: GLOBAL

@jetersen
Copy link
Member Author

jetersen commented Dec 12, 2019 •
edited
Loading

@oleg-nenashev @timja in newer version of JCasC (beyond 1.25) uploadedKeystore gets exported as **** instead of secretBytes. Because SecretBytes does not extend Secret BECAUSE IT IS FINAL 😱. This seems like a massive oversight!

So to fix this SecretBytes should extend Secret (which it not likely) or JCasC needs to do reflection to avoid converting SecretBytes to **** or even otherwise depend on credentials plugin

on 1.34

credentials:
  system:
    domainCredentials:
    - credentials:
      - usernamePassword:
          description: "testing user pass"
          id: "testing.user.pass"
          password: "{AQAAABAAAAAQBNSp+lQPLqE9vM9tzbbf7vFHAM5zDVtPYizetEpo0Fo=}"
          scope: GLOBAL
          username: "test"
      - certificate:
          description: "testing certificate"
          id: "test.certificate"
          keyStoreSource:
            uploaded:
              uploadedKeystore: "****"
          password: "{AQAAABAAAAAQj/YRHipPxGeU136Y+vu6Rjh9OUWRKnCwFg6Gf+A2SUQ=}"
          scope: GLOBAL

on 1.14

credentials:
  system:
    domainCredentials:
    - credentials:
      - usernamePassword:
          description: "testing user pass"
          id: "testing.user.pass"
          password: "{AQAAABAAAAAQBNSp+lQPLqE9vM9tzbbf7vFHAM5zDVtPYizetEpo0Fo=}"
          scope: GLOBAL
          username: "test"
      - certificate:
          description: "testing certifcate"
          id: "testing.certicate"
          keyStoreSource:
            uploaded:
              uploadedKeystore: "{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}"
          password: "{AQAAABAAAAAQWmpgpu6L+xsGbEavJJZelNzcE4DLUd5nXoAd3XRu8XM=}"
          scope: GLOBAL

@jetersen jetersen mentioned this pull request Feb 22, 2020
Merged
@jetersen
Copy link
Member Author

superseded by #135

@jetersen jetersen closed this Feb 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@jetersen